Merge "Delete TouchState::deviceId" into udc-qpr-dev am: 952272b7a5 am: d9f1988d4c

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

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