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

Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c am: 06adb3f5 am: 7e4fa5e8 am: b6380403 am: 01b52119

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

Change-Id: I9d2f42b28d30d1cde458b2f3ea77c9ca7b9dcbf6