[conflict] Merge "Trim strings added to persistent snoozed notification...

[conflict] Merge "Trim strings added to persistent snoozed notification storage." into tm-dev am: c5034c21

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



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