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: 39ca736f -s ours am: f6413e32 -s ours am: a6951c04 -s ours" into udc-dev-plus-aosp am: 71758fbc

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



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