[automerger skipped] [conflict] Merge "Enforce persisted snoozed notifications limits" into sc-dev am: 5ac423b8c2 am: 40272384d0 am: a596d7b2aa am: 772f6c9946 am: b41467e848 -s ours am: f3bcfc233e -s ours

am skip reason: skipped by user valiiftime

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

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