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: Ia80ff36c445f966ddf9e3061900602149e249312
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>