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

[automerger skipped] [conflict] Merge "Enforce persisted snoozed notifications limits" into sc-dev am: 5ac423b8 am: 40272384 am: a596d7b2 am: 772f6c99 am: b41467e8 -s ours am: f3bcfc23 -s ours am: 9ab4a542 -s ours am: 54310df8 -s ours am: 9bc4f00d -s ours

am skip reason: skipped by user valiiftime

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



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