Merge "Add google-owned SMS short codes for Namibia, United Arab Emirates" into main am: 6313459055 am: 8d78fb5aa0 am: 17e50ec22a

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

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