Merge "Allow more concurrent notifications" into rvc-qpr-dev am: dbbf77f98a

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

Change-Id: Ib04dec96542cd7e002524fa5ea6edbb63bcc9133