[automerger skipped] Merge "Trim strings added to persistent snoozed...

[automerger skipped] Merge "Trim strings added to persistent snoozed notification storage." into sc-v2-dev am: a52d1050 -s ours am: c8f96dbf -s ours

am skip reason: skipped by user aioana

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



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