Fix a mismerge by removing duplicated flag for improved wallet role icon
This should have been skipped by automerger; however we missed it due to
an unrelated merge conflict and git merge have applied the change
because it did not cause a conflict itself. The rest of aosp/3414381
was merged correctly.
Bug: 349942654
Merged-In: I5f91668aca93fcba963e046b7f26345f40a0c6f3
Change-Id: Ia8c7a741172be4a4da787c52dfa4d4f5dd9af4c1
diff --git a/core/java/android/permission/flags.aconfig b/core/java/android/permission/flags.aconfig
index 8ad3018..fdd491c 100644
--- a/core/java/android/permission/flags.aconfig
+++ b/core/java/android/permission/flags.aconfig
@@ -275,11 +275,3 @@
description: "This fixed read-only flag is used to enable new ranging permission for all ranging use cases."
bug: "370977414"
}
-
-flag {
- name: "wallet_role_icon_property_enabled"
- is_exported: true
- namespace: "wallet_integration"
- description: "This flag is used to enabled the Wallet Role s icon fetching from manifest property"
- bug: "349942654"
-}