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