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