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