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

[automerger skipped] [conflict] Merge "Trim strings added to persistent snoozed notification storage." into tm-dev am: c5034c21 am: 3a84321d -s ours am: f4f0fb4d -s ours am: 4edfb044 -s ours

am skip reason: skipped by user aioana

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



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