Merge "Merge "Lower per-app notificationchannel limit" into tm-dev am:...

Merge "Merge "Lower per-app notificationchannel limit" into tm-dev am: add48447 am: 0cc6061d am: 6ab740e2" into tm-qpr-dev-plus-aosp am: 5d5d627b

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



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