Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: b36f798f am: e7373cc5 Change-Id: I37b07d8d03cc359d18b576856453241a45fc2933