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

Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd am: 6367b480 am: d3d22be5 am: 935e4331

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

Change-Id: I485b8921b73da8c3eec18ae678a5c6fadb99d9e6