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: 211446f6

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



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