Merge "Remove char state cache." into tm-qpr-dev am: 4300a958 am: c033d904

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



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