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