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 am: 6b683898

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



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