Merge "Sanitize more of the notification text fields" into pi-dev am: c0ec138c47 am: 06adb3f55c am: 7e4fa5e87d am: b6380403ea am: 34dc3a6637 am: 33b7db96e2 am: d01444f02b

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

Change-Id: I182b78bbc4088a458e2e6d0954f8e4dbca9636a4