Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1703125

Change-Id: Ic4bcba98c1f1e43314a0a9797b427fee4bb0c20e