Merge "[automerger skipped] Allow alertOverride if the summary GROUP_ALERT_ALL am: bdd4019a16 -s ours" am: c0b17ff878 -s ours
am skip reason: Merged-In I63a51cc1d94fc8a8617ca76a0fa479e3829816c6 with SHA-1 b479d64878 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17061642
Change-Id: I4c6279e8e06444ae4727ec880e265c287f280573
This commit is contained in: