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

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

Change-Id: I0ca45bb156c64a6dff48e42450d80a1bfff85310