Merge changes If212f600,Ibbedf6e7,I7f10813f,I370d68c1,I38949223 into main am: 3dd590f333

Original change: https://android-review.googlesource.com/c/platform/external/iptables/+/2798950

Change-Id: I96a546e9e0a5ea63da7bc0e5cd991f3bd9b60997
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>