Merge "CTS secondary_user: CtsDeviceConfigTestCases" am: c650c947d2
am: 54de139908

Change-Id: If460190e4ef7db977618be2349dfac6c30e7ea7b