Merge "Improve test coverage for disconnecting networks with clat." am: f55fa638c8

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

Change-Id: Ieb08904445cabf01ed5ba6f4543699a1585fda50