[automerger skipped] Lower per-app notificationchannel limit am: 3b0929a30d -s ours am: 7fa9c4b71f -s ours am: 6c6ceba18d -s ours am: e2b61e111b -s ours am: e0ab58bc1b -s ours am: c07096e7bb -s ours

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

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

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