[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: f5a1db84 -s ours am: 07167b0b -s ours am: 77ebe8c5 -s ours am: 268e10cc -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: I715dd9d847f7c2205c21e8dd040a5fa02570adca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>