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 am: a0153962

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



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