[automerger skipped] DO NOT MERGE Increase notification channel limit. am:...

[automerger skipped] DO NOT MERGE Increase notification channel limit. am: 5664378a am: 022550d5 -s ours am: d7e53541 -s ours am: 206c83c4 -s ours am: 32d2fb5b -s ours am: b385c454 -s ours am: 67f9f1fd -s ours am: b45aeda1 -s ours am: f20d066b -s ours

am skip reason: subject contains skip directive

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



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