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