Merge "Update REVOKED_COMPAT before setting app op for runtime permission."