Merge "Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d am: 19ba4a28f9" into rvc-d1-dev-plus-aosp