Merge changes from topic "b183485987" am: 90c8570e0b

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

Change-Id: Ife58046dcaa87539fd0e6cf9d8e04c459d54565a