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

Merge "Revert "Limit the number of concurrently snoozed notifications"" into tm-dev am: 9af30793 am: 8dc1ff7f am: 3d3bb44a am: d05a677f

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



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