Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d

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

Change-Id: I23fca26a229780f79493cd03ad249fe311ae4035