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

Merge "[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: 266e4905 -s ours am: 22f8f555 -s ours" into udc-qpr-dev-plus-aosp am: f1386a4e -s ours

am skip reason: subject contains skip directive

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



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