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

Change-Id: If2570de93f70bbf27a03200ca21a1f3fe664855d