[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb60 -s ours am: 55fbfb391d -s ours

am skip reason: subject contains skip directive

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

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