Merge "Sanitize text fields" into rvc-qpr-dev am: 6f6c9c22e4

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

Change-Id: I3d057657d3a9385a38adfd050df72e7855e2e06b