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

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



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