Merge changes from topic "typing-tapping-cursor" into udc-qpr-dev am: 027baa7a am: 5ed77076

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



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