Merge change 20738 into donut

* changes:
  Fix a bug in getSocketError() in VpnService.