Merge changes from topic "configure_bpf_for_clat" am: f807ec7da7 am: e4569fc159

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

Change-Id: I39ef4de917292130dda911952f12d97bb43f3829