Merge "Sanitize more of the notification text fields" into qt-qpr1-dev am: 3830f1214c am: c6ee95fd2d

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

Change-Id: Ibd54c8f0f950a36fc8882e9571642bd23e4d9a5f