Merge "VPN: temporarily disable the default proxy when VPN is active." am: ec49c91929 am: 19d17dde29

Original change: undetermined

Change-Id: I02f436ee93438712ac2ff9a5f8fcfbb228703af3