Merge "(TouchMode Permission 2.5/n) Update CTS augmented tests"