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

Merge "[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" into rvc-d1-dev-plus-aosp am: 5ad3165f

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

Change-Id: I723e94e348c977149be8df2f4d673db31a242b36