[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: f6f287a1ef -s ours am: db4d949ee2 -s ours am: 31accf77d8 am: aa1073f47f -s ours am: 5529699510

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

Change-Id: Ie1d66b36bd6b17c2326ad84f069dc5fbcc3fcf8b