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 am: 19ba4a28

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

Change-Id: Id4104df127d15753913731675bd7cd1645286aed