Merge "Suppress InvalidPatternSyntax issue instead of demoting" into main am: 0cb5a08b am: c22f7d77

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



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