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: a2ec44b2 am: b3b2e3b3 am: ddf975e1

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

Change-Id: Ibfa061072b731a9c5d72cca18ba4d1ed4028da03