Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" am: b36f798f45

Change-Id: Ieb04ad8b9d0d36840d61cf10585672deb797c911