Merge "Create Configuration overrides for MCC/MNC values" into tm-qpr-dev am: ecc498ce

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



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