[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a7c am: 022550d586 -s ours am: d7e5354147 -s ours am: 206c83c4fe -s ours am: 32d2fb5b7a -s ours am: b385c4548e -s ours am: a43fbe7808 -s ours am: 230d0cc925 -s ours

am skip reason: subject contains skip directive

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

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