[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 skip reason: subject contains skip directive

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



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