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

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



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