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