Merge "Add telephony country code overriding" into main am: 64055a915e

Original change: https://android-review.googlesource.com/c/platform/platform_testing/+/2959192

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