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: Ib019f2abd0b1a4542504593583695c5f1246fa3e