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