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

Change-Id: I4249450e9204d732c1c6548f9af88362f157bb78