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