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

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

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