[automerger skipped] [automerge] Lower per-app notificationchannel limit 2p: 36acdd6758 am: 28da7cced2 -s ours am: d8bf4a40a0 -s ours am: 1f84246333 -s ours am: aa95d55aed -s ours

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

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

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