Merge "Sanitize more of the notification text fields" into pi-dev am:...

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

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

Change-Id: I9cf2f06605c6917c26835ae53bb21f4e31d2a39e