Merge "Merge "Delete NotifGroupManagerLegacy" into tm-qpr-dev am: 88b46e90"...

Merge "Merge "Delete NotifGroupManagerLegacy" into tm-qpr-dev am: 88b46e90" into tm-qpr-dev-plus-aosp am: d905a45a

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



Change-Id: I23cfbee6088ef5e0d8cc6dc939ee07cfd5a0372a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>