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

Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f121 am: c6ee95fd

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

Change-Id: I555f07756c6e1188ddbdf41f406c1ded2679a82e