Merge "[automerger skipped] Fix missing group alertOverride recalculation am: 2592ea1fc8 -s ours" am: d5240cbb8f -s ours am: b84668b08a -s ours am: 01856bdf4f -s ours

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

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

Change-Id: Ia55b427fd7c7904634cc575af7d51bff4b7219e7