[automerger skipped] Merge "Allow to exempt from entitlement check" into...

[automerger skipped] Merge "Allow to exempt from entitlement check" into rvc-dev am: 1fe4d26b am: 3102456a -s ours

am skip reason: Change-Id I2eb37f5e92f5f5150a7fb7c25b945e28704d27a0 with SHA-1 5788f2a1 is in history

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

Change-Id: Ie029484902142f7ee63ffbc9cd545443c9fd6926