Merge "Merge "Replace auto-revoke whitelist permission flags with appop" into rvc-dev am: 62346828 am: c526774f" into rvc-d1-dev-plus-aosp