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