Merge "Merge "Limit the size of NotificationChannel and...

Merge "Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into tm-dev am: 92c1b9e8 am: de5204f2 am: 1bc3cdfb" into tm-qpr-dev-plus-aosp am: 096643c9

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



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