Merge "Add packet capture and match network_stack adb command to to `apf_utils`" into main