Merge "Touch is not working" am: 49c2bd7f

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



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