[automerger skipped] Merge "Enforce persisted snoozed notifications limits"...

[automerger skipped] Merge "Enforce persisted snoozed notifications limits" into udc-dev am: daab9c97 am: afc99b49 am: ffc3714f -s ours am: 7d1d288a -s ours

am skip reason: Merged-In I3571fa9207b778def652130d3ca840183a9a8414 with SHA-1 da6a9ea6 is already in history

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



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