Merge "Use startUser(int userId, boolean waitFlag) and stopUser(int userId, boolean waitFlag, boolean forceFlag) with wait in CtsAppSecurityHostTestCases"