Merge "Add google-owned SMS short codes for Palestine" into main am: 08c0d31c am: 4367c6f0

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



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