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

[automerger skipped] Merge "Enforce persisted snoozed notifications limits" into tm-qpr-dev am: 0978e4d5 -s ours am: 5c824289 -s ours

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

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



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