Merge "(TouchMode Permission 1.1/n) Update CTS permission tests"