am 65e5438d: Merge change 8966 into donut

Merge commit '65e5438df929ceb8c44fd930b2a363e021914bd0'

* commit '65e5438df929ceb8c44fd930b2a363e021914bd0':
  Add tests for android.net.vpn.