Merge "Extend SUPL network request timeout for consecutive SUPL request" into rvc-d1-dev am: db9c531910 am: 5b908d36a3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12279987

Change-Id: I3d0df59908e742b03c930360c12b35c1fa5cf0d3