Merge "Trim strings added to persistent snoozed notification storage." into...

Merge "Trim strings added to persistent snoozed notification storage." into tm-qpr-dev am: adbbfc2a am: 6e1a34e8

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



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