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: 608741d1

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



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