[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 skip reason: skipped by user aioana

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



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