Merge "Update SMS short code list for Bahrain" am: 494a1ed6 am: 8022fc28...

Merge "Update SMS short code list for Bahrain" am: 494a1ed6 am: 8022fc28 am: 2292d20d am: 367f30c3

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



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