Merge "Undeprecate android.net.ProxyInfo as it's still used." into mnc-dev
tree: 263e858be031deb32aea8d06f2c69fec2c700037
  1. core/
  2. services/
  3. tests/