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

[automerger skipped] Fix a mismerge by removing duplicated flag for improved wallet role icon am: a13c7092 -s ours am: 2bc5865a -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: I66cd72d6d390e71a3a0364c62d8c4a26b74362e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>