[automerger skipped] Merge "Prevent incorrect alert triggering" into...

[automerger skipped] Merge "Prevent incorrect alert triggering" into mainline-prod am: 824bb627 -s ours

am skip reason: Change-Id Iada3df54ebb30353572a14e0db86bed49c5515b0 with SHA-1 ec72e875 is in history

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

Change-Id: I7458e934245f5a4f5bbf946d74fe843ab954de90