Merge "Add replaceFirewallChain API" am: 094de6b7c4

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

Change-Id: Ieedd7bcaf6e626f905863e8abcf9e0498f409681