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

Change-Id: Ieec51805fea60fcebad362692e30a8ae80fb215a