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: b247a0da" into rvc-qpr-dev-plus-aosp am: 77409050

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

Change-Id: I8e3a9a6feca559e68487c7356948754a58ff114f