Merge "Allowed emergency SUPL when data is disabled" into tm-dev am: 5fe61c4b am: 9bcee703

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



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