[automerger skipped] Merge "[DO NOT MERGE] Enforce persisted snoozed notifications limits" into rvc-dev am: 2b9e13fb28 am: 7ee867d8eb -s ours am: 42a324e555 -s ours am: 08b86ffd37 -s ours am: baecf65e85 -s ours am: 0e26bd6dc1 -s ours am: f39f6ae94b -s ours am: fbe2646202 -s ours am: 1e80727844 -s ours am: 31817a72bb -s ours

am skip reason: subject contains skip directive

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

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