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

[automerger skipped] Merge "[conflict] Merge "Trim strings added to persistent snoozed notification storage." into tm-dev am: c5034c21" into tm-mainline-prod am: cb529b48 -s ours am: a388c1f2 -s ours

am skip reason: skipped by user aioana

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



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