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

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

Change-Id: I7b4112e65d4cadfad2e5eb2289b3a79306d8c221