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

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

Change-Id: Ie201a0bbc48615f8c74c4a69ea154f8c9a795ab7