Merge "Limit the number of concurrently snoozed notifications" into tm-dev am:...

Merge "Limit the number of concurrently snoozed notifications" into tm-dev am: 5f5220c3 am: 826e83e1

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



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