Merge "Add @NonNull and @Nullable annotations to VpnService#Builder."