Merge "Use consistent addresses in SSLCertificateSocketFactoryTest." am: 14e08ef40e am: 865a5b4878

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

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