[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-qpr1-dev am: 9595707df0 -s ours am: f16157ca1b -s ours am: c0b4aeefb7 -s ours am: 6830d59680 -s ours am: ac0a8f2449 -s ours am: cdf406879e -s ours
am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 aa170108bd is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20079399
Change-Id: I966788cb25ab628788d2f68b1b343d7406a5aa6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in: