[automerger skipped] Merge "Lower per-app notificationchannel limit" into sc-dev am: 815880be21 -s ours

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

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

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