Merge changes from topic "permission_hub_2_framework" into rvc-qpr-dev am: b7130b27

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12154741

Change-Id: Icdf461632e2104e05c5d3148ea4c0741ea4b1291