Bug: 363886476 Test: verify SUPL NI test pass (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:ea53f43031e0ca9930f145feff56221f041afa5c) Merged-In: I56f0139c748a3a04df9f3998653121948846c8fe Change-Id: I56f0139c748a3a04df9f3998653121948846c8fe