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