Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main am: 0cb5a08bb4 am: 8b70e82c55

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

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