Merge "Correct mmsproxy and mmsport" am: 69d69822ce am: 1f1216b1dc am: f71ea546e9 am: 69df3effbe

Original change: https://android-review.googlesource.com/c/device/sample/+/2041584

Change-Id: Ic01cb467676757d400f9f9e46b3cef37a17b3a4d