[automerger skipped] Merge "Fix a mismerge by removing duplicated flag for...

[automerger skipped] Merge "Fix a mismerge by removing duplicated flag for improved wallet role icon" into main am: 2daef7f6 -s ours

am skip reason: Merged-In I5f91668aca93fcba963e046b7f26345f40a0c6f3 with SHA-1 b43c587e is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3412029



Change-Id: Ib17b86636e9614c2c543b6f13c7efa79380076be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>