Merge "Add @NonNull and @Nullable annotations to VpnService#Builder." am: 1957b624ab am: 65edc0d81d
am: 5bd46a5f9a

Change-Id: Ia5bd0ea491f378bd490ebdba2f5b53dbcd18f2c5