Merge "ClatCoordinatorTest: override test generateIpv6Address correctly" am: 00b2f18c37

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

Change-Id: I140f44b8f41c811c1a3f31d89962880717640536
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>