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

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

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