Merge "Lower per-app notificationchannel limit" into tm-qpr-dev am: 9962ee2c

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



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