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