Merge "Fix incorrect logic in touch explorer state transitions." into udc-dev...

Merge "Fix incorrect logic in touch explorer state transitions." into udc-dev am: 84c2fd77 am: dd5bafd3

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



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