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