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: d70d1265 am: eff17a6b

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



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