am de04cb81: Merge change Ie9f76062 into eclair

Merge commit 'de04cb810f47c679583767df78f8490d96d310d1' into eclair-plus-aosp

* commit 'de04cb810f47c679583767df78f8490d96d310d1':
  Add Gservices flag for Vending doctor download complete timeout.