Merge "CTS: WifiManager.addNetwork with HttpProxy" am: b99788eb24 am: 155a81349f
am: 968719035d

Change-Id: Id70c0b0c95edf0615400cfe59f089d9411d48d12