Merge changes from topic "configure_bpf_for_clat" am: f807ec7da7 am: ab6566a961 am: cd1f590335

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

Change-Id: I5746d025ea44f1fa82ee1e7730a555ceb17a9e83