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

Change-Id: Id7aae997be91257c2cb7f59955e7ad6e44e66045