Merge "Lower per-app notificationchannel limit" into tm-dev am: add48447 am: 72dfa481

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



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