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

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

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