Merge "Merge "Exempt companion apps from auto revoke" into rvc-dev am:...

Merge "Merge "Exempt companion apps from auto revoke" into rvc-dev am: 4b3418bf am: 1eaa062d am: c589f655" into rvc-qpr-dev-plus-aosp am: 004d28d1

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

Change-Id: I9bdbe59a84a189530c23f3a683147ab2c9868ec8