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

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

Change-Id: Ia3bda5ece5d8c8482763d1e4bf8255841698c74f