Merge "bpf: Add interface index to BPF devmap" am: aa10ddfa6f am: 72bd34e343 am: 6b5e448f79 am: c702f5c9ba

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

Change-Id: I8965f9db0c831320cbc5cd319da7531614070112