Merge "Do not use IWLAN mcc for location" into tm-qpr-dev am: a18ecc83

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/opt/telephony/+/19747060



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