[automerger skipped] Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main am: 0cb5a08bb4 am: 8b70e82c55 am: 4bbc3ee21e -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: I6cc31e9ea2ab5d0d2e8c6e7c3d90dd878f185fbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>