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