Merge "CTS secondary_user: CtsUsbTests"
am: 6ca2e416f7

Change-Id: Ieec4d416df54875bb82a304d336771e1eb132d77