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

Merge "[automerger skipped] Limit the number of concurrently snoozed notifications am: bc808de2 am: 07530202 -s ours am: be54af47 -s ours am: 94d408e5 -s ours am: 6e304051 -s ours am: c6b1d524 -s ours" into tm-d1-dev-plus-aosp am: b29c1650 -s ours

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

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



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