Merge "Add google-owned SMS short codes for AR and KE, update PE short code"...

Merge "Add google-owned SMS short codes for AR and KE, update PE short code" am: b6f5ad36 am: 9c713acd am: 58b60a30 am: 9dacd645 am: c4cfd963

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



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