Revert "Revert "Add VpnServiceBuilderShim for VpnService.Builder""

This reverts commit f1b806e827fdbace18029c3829872f8334665645.

Reason for revert: failing build target configuration is fixed

Change-Id: I07104340a04adb140c51b7bc16412df9c25b3b01
5 files changed