[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: I8ef804b60e4772b77a8c4ac348bd6f8a18f74a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>