Merge "Make sure mms proxy is hostname" into tm-dev am: 1a3b4ca6 am: 5fd65762

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17643666



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