Merge "Add SocketUtils CTS tests am: 0141ef0948" into qt-dev-plus-aosp am: 364c77f92e
am: f6a8f19632

Change-Id: Ib9a37cb7def991896fba61fbefe61eb8b583a1fb