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

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

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