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

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



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