Merge "Expose IpConfiguration and ProxyInfo APIs" am: 920a4a5b1b
am: 4082917f46

Change-Id: I9ef7325d73b1df9b1a3eb32e419e4cd1caeb7729