[automerger skipped] Lower per-app notificationchannel limit am: aa170108 -s...

[automerger skipped] Lower per-app notificationchannel limit am: aa170108 -s ours am: 5fe7e4d6 -s ours am: 1054a62f -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: Ieaa776129f055cee5b7790ed86f7af9d12203428
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>