[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: 25cf6876 -s ours am: d8e3b984 -s ours

am skip reason: skipped by user aioana

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



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