[automerger skipped] Fix missing group alertOverride recalculation am:...

[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1f -s ours am: f835a0f6 -s ours am: d22b3004 -s ours

am skip reason: Merged-In I4447810af5e2a17c3b6841dfa5cd31703e5f334d with SHA-1 aa6a7754 is already in history

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

Change-Id: Iab1dc0352ad402d9d503b37fd0673cdd6250069b