[automerger skipped] Add sensitive content redaction to notif pipeline am:...

[automerger skipped] Add sensitive content redaction to notif pipeline am: 9a4112bf am: a1cc90e0 -s ours

am skip reason: Merged-In I57b4d68f440ea50f13f6da4676144400f875ea8c with SHA-1 6a9124a0 is already in history

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

Change-Id: I2b712b479fea5404d6924298b8f59bf4d078dde4