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

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

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

Change-Id: I1cb81531654913188fb10566a60d1880c2374e9c