Merge "Stop holding mProxyLock while downloading PAC script data." am: 7b26041ccc
am: 42d6843aa4

Change-Id: Idc1b507555415d467669c7e1d1c9035b449de763