Merge "Add FLAG_PERMISSION_REVOKED_COMPAT."