Merge "Resolve associated display and pointer display in CursorInputMapper" into tm-qpr-dev am: ff41b63eb2

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

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