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

[automerger skipped] Merge "Trim strings added to persistent snoozed notification storage." into sc-qpr1-dev am: 3a59f424 am: acb896ff am: fdefdbe2 am: 55679ce8 -s ours am: 0ca45f8a -s ours

am skip reason: Merged-In I5a2823f10053ea8c83c612a567d6d4f1b6af23e7 with SHA-1 bffb18e8 is already in history

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



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