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