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

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

Change-Id: If8de1748ccac12fe89228a9cfcc6e09615e968ed