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

[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be -s ours am: b0a0c351 -s ours am: ea09110e -s ours am: 6327a2bd -s ours am: 48c9785c -s ours am: f8e5ca6e -s ours

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

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



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