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

[automerger skipped] DO NOT MERGE Increase notification channel limit. am: de7c43eb -s ours am: 55fbfb39 -s ours am: e1ca6ae9 -s ours am: b9f7e703 -s ours am: bdfb599a -s ours am: 39ca736f -s ours am: f6413e32 -s ours am: a2faf3d1 -s ours

am skip reason: subject contains skip directive

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



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