am 0e638630: Merge change 8291 into donut
am 0e638630: Merge change 8291 into donut

Merge commit '0e6386300c958c5566d09b6a18b4338a6db3e965'

* commit '0e6386300c958c5566d09b6a18b4338a6db3e965':
  Add gservices flag for configuring the URL vending redirects to when TOS is inaccessible due to no/bad network.

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base