[automerger skipped] Merge "[DO NOT MERGE] Prevent TextInterpolator from...

[automerger skipped] Merge "[DO NOT MERGE] Prevent TextInterpolator from rendering nonprintable newlines" into tm-qpr-dev am: b1267ef7 am: 83299c21 -s ours

am skip reason: subject contains skip directive

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



Change-Id: If70dc9bb31e8b1b5f061f0a3cf4af82e3583999c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>