Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d am: b6380403ea am: 34dc3a6637 am: 0c6dcaa84a am: 958dff765b

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

Change-Id: I85f84854e8f888b787ffdd00ec5ab6b28d237ab9