Merge "Skip CtsNoPermissionTestCases25 tests on target watch" into android11-tests-dev