[automerger skipped] Merge "[DO NOT MERGE] Enforce persisted snoozed...

[automerger skipped] Merge "[DO NOT MERGE] Enforce persisted snoozed notifications limits" into rvc-dev am: 2b9e13fb am: 7ee867d8 -s ours am: 42a324e5 -s ours am: 08b86ffd -s ours am: baecf65e -s ours am: 0e26bd6d -s ours

am skip reason: subject contains skip directive

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



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