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