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

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

Change-Id: Id15ee260996bb94970ef49b7a03c1ea1b296a407