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