Merge "[automerger skipped] DO NOT MERGE Increase notification channel limit....

Merge "[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: 28171a11 -s ours" into udc-dev am: 3e1928ca am: a0d4be2c am: 3a15b7ab

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



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