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

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

Change-Id: I11da01809dc028e3a5d4165b623b3fa6e51da4ae