Merge "Exempt companion apps from auto revoke" into rvc-dev am: 4b3418bf am: 1eaa062d

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

Change-Id: Ib213a4f0e2b4d56565dbc0c912bb15a3b8109fbf