[automerger skipped] Merge "Allow alertOverride if the summary...

[automerger skipped] Merge "Allow alertOverride if the summary GROUP_ALERT_ALL" into sc-v2-dev am: 7be75566 am: 72ace199 -s ours

am skip reason: Merged-In I63a51cc1d94fc8a8617ca76a0fa479e3829816c6 with SHA-1 6ee64f6f is already in history

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

Change-Id: I5e57f09c1d6cca297910f9b78b8f1bf2545faa22