Merge "Monitor interface added and update bpf interface map" am: 8036c626b2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1954391

Change-Id: I9e22aa42dc0b878ea6a89c9003acebcf07a508bb