Merge "Monitor interface added and update bpf interface map" am: d6ba5ab1b5 am: 0e5a1b21cf am: 402c615d7a

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

Change-Id: I9e4c22d389039ea5673b489de5e9147be942349d