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