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