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

[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-v2-dev am: 16c4ba8c -s ours am: 4904bd67 -s ours am: c00953e2 -s ours am: 62abb664 -s ours

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

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



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