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

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

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