Merge "Replace auto-revoke whitelist permission flags with appop" into rvc-dev