Merge "Fix for MulticastSocketTest for non-multicast interfaces" into lollipop-cts-dev