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

Merge "[automerger skipped] Trim strings added to persistent snoozed notification storage. am: 6b587717 -s ours am: f9c536a3 -s ours am: 710eed86 -s ours am: 5db24d9d -s ours am: 3f58018f -s ours am: 5a524ed4 -s ours am: e19255ce -s ours am: 364be2dd -s ours am: 8bd83979 -s ours am: fa00f3af -s ours"