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