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