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

Merge "Trim strings added to persistent snoozed notification storage." into sc-dev am: 999e19b8 am: 7e090c87 am: ff764180 am: 0177408b

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



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