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

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

Change-Id: Ib6e51c8ca866590f4c4f0a7860c08fccab90c5ec