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