DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604

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

Change-Id: I63fec9ad25d189e68aee9e3b5b43ebd53cf7aab7