Merge "Merge "Merge "Sanitize more of the notification text fields" into...

Merge "Merge "Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd am: 6367b480" into rvc-d1-dev-plus-aosp am: 68449924" into rvc-qpr-dev-plus-aosp am: fba2ab7d

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

Change-Id: I2c7ee232e19875e1bfe292dfff079bb304bf6281