Merge "Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f am: 6367b4800e" into rvc-d1-dev-plus-aosp