Merge change 7819 into donut

* changes:
  Fix NullPointer in VpnServiceBinder.checkStatus().