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

Merge "Lower per-app notificationchannel limit" into tm-dev am: add48447 am: 4be95ea3 am: 2b37f8c0

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



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