[automerger skipped] Merge "Remove numeric id from SystemUI Flagging System" into udc-qpr-dev am: e3360fa4f9 am: d75caec4a2 -s ours

am skip reason: Merged-In Id88c6652c3280370784d39e94de9ea8a6f20eb9c with SHA-1 bc79511501 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/modules/IntentResolver/+/24344096

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