Merge "Revert "Add google-owned SMS short codes for Namibia, United Arab Emirates"" into main am: 3065779a38 am: 518f979e5d

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

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