Merge "Allow more concurrent notifications" into rvc-qpr-dev am: dbbf77f9 am: 9ae8497e

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

Change-Id: I606dcd6614b9fcd510c90093a0d16f90254ddd06