Merge "Add API to set the sll_protocol on PacketSocket"
am: 0d6c308c39

Change-Id: I203f26229dcd580704665f7a07a391facef49a17