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

[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd am: 2d7d8c26 am: 5b662fd7 -s ours am: 55f9c81e -s ours am: f6d7b592 am: 8084de65 -s ours am: 2d983ecc am: d1ff215c am: 1a93e261 am: 8aca8fa8 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I95ea6bdec6232bdc047a3855b9e36dd80f249e33