Merge "(TouchMode Permission 2.6/n) Revert Instrumentation#setInTouchMode"