Merge "Correctly Set Primary Pointer in TouchState" into main am: db61fff8bd

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2978391

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