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