Merge "Check for bpf support at NetworkStatsService start"
am: 0defa6e72c

Change-Id: Ia2b5c8c7b7185787fee57281727b366752ef887f