[automerger skipped] Merge "Add SocketUtils CTS tests am: 0141ef0948" into qt-dev-plus-aosp am: 364c77f92e am: f6a8f19632
am:477b525bf9-s ours am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA193a53224d3is in history Change-Id: I42f498e0596eb2dce855f0267b76b4f04c4f31aa
This commit is contained in: