Merge "Remove numeric id from SystemUI Flagging System" into udc-qpr-dev am: e3360fa4f9

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

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