[automerger skipped] Merge "DO NOT MERGE Add permission checks before...

[automerger skipped] Merge "DO NOT MERGE Add permission checks before delivery" into rvc-qpr-dev am: 0dd050cb am: a7320dc9 -s ours

am skip reason: subject contains skip directive

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

Change-Id: Id979c869ee739e1dc3e7673d880e9989cd2405b3