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