[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1 -s ours am: db4d949e -s ours

am skip reason: subject contains skip directive

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

Change-Id: If516e824730abcd5523d174045f7f53a6afceb1c