Merge "Merge "Add google-owned SMS short codes for KE and RW" am: b8d1268e...

Merge "Merge "Add google-owned SMS short codes for KE and RW" am: b8d1268e am: 118c22bb am: 8eda7f6a" into udc-dev-plus-aosp am: 8cb94437 am: 09b6a45f am: 460f98c3

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



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