Merge "Merge "Limit the number of concurrently snoozed notifications" into...

Merge "Merge "Limit the number of concurrently snoozed notifications" into tm-dev am: 5f5220c3 am: 826e83e1" into tm-d1-dev-plus-aosp am: 0944e835

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



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