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

[automerger skipped] Merge "Trim strings added to persistent snoozed notification storage." into sc-dev am: 999e19b8 am: 7e090c87 am: ff764180 am: 0177408b am: 706d32b0 -s ours am: 2bf964cd -s ours am: 132d3953 -s ours am: 9ff5590b -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/+/21740239



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