[automerger skipped] DO NOT MERGE Sanitize more of the notification text fields am: db023fcd73 am: 2d7d8c2604 am: 5b662fd7c1 -s ours am: 55f9c81eba -s ours am: f6d7b592ff am: 8084de65e4 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I47cb1fad436cfca87677ee5510f69b6211559d3e