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 am: 5ccdc796 am: 4bd1d449

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

Change-Id: If022e306b57e619dac8cbb344bb4e6cfb96bcabf