Merge "Exempt companion apps from auto revoke" into rvc-dev am: 4b3418bf am: 185d90c5 am: 7fd4c6aa

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

Change-Id: I83b5d33de50d61d2d683fc10b51739fb9b6c0624