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: 68f5fc48

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

Change-Id: Ic2b49e8c8b08742443679eda7f4c6e8a48dff3bb