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