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