Merge "Add google-owned SMS short codes for Namibia, United Arab Emirates" into main am: 6313459055 am: 211446f6da am: ce05b58f78

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

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