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

Merge "Add google-owned SMS short codes for Namibia, United Arab Emirates" into main am: 63134590 am: 8d78fb5a

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



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