Merge "Add replaceFirewallChain API" am: 094de6b7c4 am: 4dc885c036

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

Change-Id: I9c2884ef1e59184565bf3d0ab20cb21b4ec4b4b3