[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-v2-dev am: 16c4ba8c28 -s ours am: 4904bd6725 -s ours am: 0dc138cf1a -s ours am: 7bd23baeef -s ours
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 39b4b1e9aa is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20084464
Change-Id: I2a82c8d436b707bb9c0628b6fab21a64c5b59f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: