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

[automerger skipped] Merge "Fix missing group alertOverride recalculation" into sc-v2-dev am: e7781424 am: 2a6f5aa7 -s ours

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

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

Change-Id: Ide32b64ee2cc5602ce44a3df82b53cf4089d6aaf