Merge "Add google-owned SMS short codes for Indonesia, Bangladesh, Mexico and...

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

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



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