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

Merge "Merge "Limit the size of NotificationChannel and NotificationChannelGroup" into rvc-dev am: 04ccf69d am: 6155a177 am: c08dd8f0 am: 64c3c93c am: 4c475e70 am: cec5611e am: 08f8a5ce" into tm-d1-dev-plus-aosp am: 35703c61

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



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