Merge "CTS secondary_user: CtsNetApi23TestCases" am: 40ad92dc08
am: 991452a6ca

Change-Id: I3d604eb604130f41a4a0ce5b6c63de75b679d589