[conflict] Merge "Enforce persisted snoozed notifications limits" into sc-dev...

[conflict] Merge "Enforce persisted snoozed notifications limits" into sc-dev am: 5ac423b8 am: 40272384 am: a596d7b2 am: 772f6c99

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



Bug: 313998561

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