[automerger skipped] Merge "Add SocketUtils CTS tests am: 4f4206d56f am: c91dfb967b" into qt-r1-dev-plus-aosp am: f5f95fce12
am:69dfdd247a-s ours am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA16b16c42b64is in history Change-Id: Id31da8aaa8782d340d77dc81c784ee603cb2458e
This commit is contained in: