Merge "CTS secondary_user: CtsRoleTestCases" am: 66c647380a
am: 7153f23619

Change-Id: Ie652a0f1a210bdf605e351d837dedd0c562fc0e6