Merge "Add replaceFirewallChain API" am: 094de6b7c4 am: 52cf873cab am: c4946fc310

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

Change-Id: Icc352e405c4704932d82b2207d1a81dd810b59cb