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