Merge "Add @NonNull annotation to set proxy on VPN parameter." am: 909baeddfa am: 121dab8e6b
am: 64f39de1de

Change-Id: Id84b4881dcfeb83d1faf55b7f1220b84efe63860