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

am skip reason: subject contains skip directive

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

Change-Id: I1a7e611a7eab7666a787f7bc120703704ae5e345