[automerger skipped] Merge "Limit the number of concurrently snoozed...

[automerger skipped] Merge "Limit the number of concurrently snoozed notifications" into sc-qpr1-dev am: 06de2157 -s ours am: 40ffa103 -s ours

am skip reason: Merged-In I005b43979d1c708fd505c8b33ae0c8cb03ddbb35 with SHA-1 e61de064 is already in history

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



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