Merge "Tidy up CtsAppSecurityHostTestCases for PM test plan"