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

Change-Id: Idbb16f8ae3b35f22cbef254c5f20aaf989acaab9