[automerger skipped] Allowed emergency SUPL when data is disabled am:...

[automerger skipped] Allowed emergency SUPL when data is disabled am: 0c9543cb am: c6fe9052 -s ours am: 6af9a00c -s ours

am skip reason: Merged-In I0a30b9e6c18b15b66cc521292d8f9262e37a3fc8 with SHA-1 470e4838 is already in history

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



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