Merge "Support more than 8 firewall chains / match types." into tm-dev am: d3cd66e224

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

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