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

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

Change-Id: I3bf55630d3643528f85a85cf65a7fc2c5a1f38c6