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 am: 715e7fdf

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

Change-Id: Ia2d27cfb533cf31618c7b228b2368d44102a1210