Merge "Replace auto-revoke whitelist permission flags with appop" into rvc-dev am: 62346828 am: c526774f am: e5e28150 Change-Id: I3236a3e2ac7d8f2346dae69a81642e9f172cfa08