[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 am: bdbb176b -s ours

am skip reason: subject contains skip directive

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

Change-Id: I5b740b390d58e508c9896d092e5fd3439f73779e