Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2 am: e059ae56

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

Change-Id: I1a00b7a987f77f1c35d6c0a34f39b8fe1a861e60