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

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

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