[automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 6950f0f417 -s ours am: dada90cbb9 -s ours am: 13ce7235fb -s ours am: 761bea88db -s ours am: bb3c5ac8ce -s ours

am skip reason: Merged-In I8c12e3fc73e4a88842af275feaf2acffcced0402 with SHA-1 3b0929a30d is already in history

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

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