Merge "Support more than 8 firewall chains / match types." am: 4eacf772c2 am: 0488130e1a

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

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