Merge "CTS secondary_user: CtsAssistTestCases" am: 8b006654ad
am: ca2798a932

Change-Id: I7baea27fcaf0ae4fdd97a35f0c04efa89e128ef6