[components] Merge https://github.com/mozilla-mobile/android-components/pull/7554
treef90caa81e7bf3f0e54b1e442cce77ab30ee27c86
drwxr-xr-x - mobile