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 am: 76c5b976

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



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