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

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

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