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

Original change: undetermined

Change-Id: I0d93262989047aba0d3235e3a7f4262d9c2d94e6