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: 695d9cce am: 3e7871d1 am: ba90f2a5" into tm-d1-dev-plus-aosp am: 4a528745 am: de071877

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



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