[automerger skipped] Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main am: 0cb5a08bb4 am: c22f7d776d am: ab360502c3 -s ours

am skip reason: Merged-In Ic408374fc30f849eedbb60c6f470e432c46d0576 with SHA-1 929d298d7a is already in history

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

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