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: d6ed513d am: dec8d4af

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



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