[automerger skipped] Merge "TouchInputMapper: Fix display association for...

[automerger skipped] Merge "TouchInputMapper: Fix display association for POINTER mode" into main am: 041ee31d am: 7e6be236 -s ours

am skip reason: Merged-In Ice0ee9be87d0582c553ef3743ac3f0d49a12c6ea with SHA-1 8f1a0c3f is already in history

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



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