Merge "Switch to a single PacketSocketAddress constructor"
am: 2d24f7a39e

Change-Id: I02a94993014b7c6e81c20b3e09f03c8fed88ae76