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