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

Change-Id: Id25d1a1057dd1313e61bb3909de032d61527f85a