Merge "Use startUser(int userId, boolean waitFlag) and stopUser(int userId, boolean waitFlag, boolean forceFlag) with wait in CtsAppSecurityHostTestCases" am: 647379c684 am: b807188e85
am: 47c9afd408

Change-Id: I4281554e4bf677c7532c3e9c3fa9af24fa652e9f