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

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



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