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