[automerger skipped] DO NOT MERGE Sanitize more of the notification text...

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

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

Change-Id: Ie1d66b36bd6b17c2326ad84f069dc5fbcc3fcf8b