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