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

Merge "Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into tm-dev am: 92c1b9e8 am: 8d506d35 am: 8333e8bf" into tm-qpr-dev-plus-aosp am: 4a4b57a3

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



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