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: 185d90c5 am: 7fd4c6aa" into rvc-qpr-dev-plus-aosp am: 4e24c555

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

Change-Id: I8889a7e1f2d4552b1e8b290fce20d6976f32b28a