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

Merge "Lower per-app notificationchannel limit" into tm-dev am: add48447 am: 0cc6061d am: a5a92637 am: f99a7dcc

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



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