Merge "Add displayId to transferTouch" into tm-dev am: 8fc187cbc6 am: 6804aab45d

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

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