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

Change-Id: I99307d7aeb0e8c96de51e53a5bc373e570715860