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

Merge "Sanitize more of the notification text fields" into qt-dev am: e07950e2 am: e059ae56 am: 77bc1848 am: e582a90c am: f75ea070 am: 65b9aa62

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

Change-Id: Ic58a68e9ef75cf17df22b7f990c1325bdf7cdc28