[automerger skipped] Merge "Add CTS for SocketUtils.makePacketSocketAddress(int, int, byte[])" into rvc-dev am: aff8656f -s ours am: 3583ad20 -s ours am: 2dc88b2d -s ours

am skip reason: Change-Id I4b5a3dfb78b404d414b7dc358e6f16c3414a8b33 with SHA-1 f671c02f is in history

Change-Id: I60621f7b87ba4368cdf451797eadc231e5135590