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

Merge "[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1f -s ours" am: d5240cbb -s ours am: b84668b0 -s ours am: 01856bdf -s ours am: 39303289 -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: I117f764a028191ecb1322ac3f99bdb3b0afd1812