[automerger skipped] Merge "Enforce persisted snoozed notifications limits" into tm-qpr-dev am: 0978e4d516 -s ours am: 5c824289eb -s ours am: 4e1aef34fd -s ours

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

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

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