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

am skip reason: skipped by user aioana

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



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