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