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

Change-Id: I2a9b6a9a3ced75e409245c5f0216591adb99876d