[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff

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

Change-Id: I701d42ffdfe32e318c5364cf7e37b41f4f90e56d