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