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

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

Change-Id: I711ffc7c5a977b975e50f3ab420dd34f6e9035d6