[automerger skipped] Merge "Lower per-app notificationchannel limit" into...

[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev am: 9595707d -s ours am: f16157ca -s ours am: c0b4aeef -s ours am: 6830d596 -s ours am: af586f09 -s ours am: c38ee82c -s ours

am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108 is already in history

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



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