[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: 7af31536 -s ours am: 452547e6 -s ours

am skip reason: skipped by user aioana

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



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