Merge changes from topic "configure_bpf_for_clat" am: f807ec7da7

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1952096

Change-Id: I986cccf522c76285f67bb8d1888e95b7c70d7c41