Merge "Correct mmsproxies extra zeros in Greece and Austria" into main am: 885bfc11a7 am: a83b740701

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

Change-Id: I6f7544cc616c71c079ea876247c06a97d0e69515
Signed-off-by: Automerger Merge Worker <[email protected]>