Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c am: 06adb3f5

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

Change-Id: I4b08f76c920929010808063679b081e10a37c798