Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab...

Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main am: 3065779a am: 518f979e am: 400b9a56

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



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