[automerger skipped] [DO NOT MERGE] Enforce persisted snoozed notifications limits am: 87c11b6df3 am: 42871c8c73 -s ours am: 66b1cc3ab0 -s ours am: 9465ba74fa -s ours am: 65ef6c727b -s ours am: 6b4b09182b -s ours am: 3010a45913 -s ours

am skip reason: subject contains skip directive

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

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