Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd am: 1ed53ed9 am: 089f82de am: ae95e2a4

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

Change-Id: I3316423ce47e902bf9fd99f550124a6cc3057b3a