Merge "Add SocketUtils CTS tests am: 0141ef0948 am: f770a59ba2" into qt-r1-dev-plus-aosp
am: f5f95fce12

Change-Id: I26b15368b078084158ad91df5d26cea93aff8cd4