Merge "remove dead register_com_android_networkstack_tethering_BpfUtils" into main