Merge "Fixed SUPL not working in nDDS when emergency call" am: a8994214 am:...

Merge "Fixed SUPL not working in nDDS when emergency call" am: a8994214 am: 08013e4e am: 14f180d8 am: bea2089a

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



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