am 39846e69: Merge change 7819 into donut

Merge commit '39846e691976fa7335bf5e648de46268d24b9927'

* commit '39846e691976fa7335bf5e648de46268d24b9927':
  Fix NullPointer in VpnServiceBinder.checkStatus().