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