Merge "Add google-owned SMS short codes for Indonesia, Bangladesh, Mexico and Newzealand" into main am: 6b530f2a am: c1368474

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



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