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