[automerger skipped] Merge "Check for bpf support at NetworkStatsService start" am: 0defa6e72c am: 8196301e24 -s ours
am: 5e006b9300 -s ours
Change-Id: I744e7fd2e6e8d4a68404c7a9d924da321ff94ba0
This commit is contained in:
am: 5e006b9300 -s ours
Change-Id: I744e7fd2e6e8d4a68404c7a9d924da321ff94ba0