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

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

Change-Id: Id06f3ef071b71def30b5d2c1024dfbc2b53ba682