Merge "Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a...

Merge "Merge "Increase notification channel limit" into rvc-dev am: 8d139f6a am: 336418d3 am: 3c1bc9a9" into rvc-qpr-dev-plus-aosp am: 2996d03e

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

Change-Id: I5610ec68bac9fb0032df82ac876afdbf3a18b672