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

Change-Id: Ic732bf56e8603ffe215d7689e2101e3c6f6c0b25