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 am: 34dc3a66 am: 0c6dcaa8 am: 958dff76

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

Change-Id: I85f84854e8f888b787ffdd00ec5ab6b28d237ab9