[automerger skipped] Merge "Resolve associated display and pointer display in...

[automerger skipped] Merge "Resolve associated display and pointer display in CursorInputMapper" into tm-qpr-dev am: ff41b63e am: 39f27692 -s ours

am skip reason: Merged-In I1021c121c1eae768585124d312f5187be90da666 with SHA-1 c13ff081 is already in history

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



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