Merge "Transform injected cursor positions" into tm-qpr-dev am: e23a168dd4 am: e349b9de72

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

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