Merge "Merge "Add permission requirement" into rvc-dev am: 2ea259c0 am:...

Merge "Merge "Add permission requirement" into rvc-dev am: 2ea259c0 am: 1d332c56 am: ede180ae" into rvc-qpr-dev-plus-aosp am: c28bf379

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

Change-Id: I99f6011518bf30f1a32abe6d1b6e687de78de619