Merge "[PT11] Move handleDeprecatedGlobalHttpProxy to ProxyTracker" am: a3b3b6468e am: d75467d84a
am: 9dd53f080e

Change-Id: Ic2f23e9690ada55bb666ca6e88517b68f2e9cb88