Merge "Sanitize more of the notification text fields" into rvc-dev am: ceb7aefd6f

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

Change-Id: Ie996b9a2f55d0df45691ddb793f8f052cd746bdd