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: 6fd76421 am: d1a7f4f7

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



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