Merge "InetDiagSocketTest: enable UDP unit tests on all devices" am: 23a73be430
am: 89af05bc4c

Change-Id: I654b5ad22e341535c5a01f96ea1058c07ff4ae96