[automerger skipped] Merge "Add SocketUtils CTS tests am: 0141ef0948 am: f770a59ba2" into qt-r1-dev-plus-aosp am: f5f95fce12
am:ba7620da8d-s ours am skip reason: change_id I36252fdf516cf4a9d4506b615cdb38f5413739e5 with SHA193a53224d3is in history Change-Id: Id31da8aaa8782d340d77dc81c784ee603cb2458e
This commit is contained in: