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

[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1f -s ours am: 33a03df4 -s ours am: 7ecf9146 -s ours

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

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

Change-Id: I2694c420bd666df87130d66ef9ea02ab6580411d