Merge "Merge "Improve error message in WMS#isInTouchMode" into udc-dev am:...

Merge "Merge "Improve error message in WMS#isInTouchMode" into udc-dev am: a69c3fe7 am: 0ea777dc am: b67bcfdf" into udc-qpr-dev-plus-aosp am: 63afe2b9

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



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