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