Merge "Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb2"...

Merge "Merge "TouchExplorerTest: fix run error." into sc-dev am: 1219bfb2" into sc-v2-dev am: 8af8f813

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

Change-Id: I2ba66ee0b0f39c4e7208d6133c0516cba50c5934