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

[automerger skipped] Merge "Revert "Revert "Limit the number of concurrently snoozed notifications""" into tm-dev am: b90c6b90 -s ours am: f2e80710 -s ours

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

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



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