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

Change-Id: I20c1462b47babbaea7c9fcab08692272a242fcf5