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