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