[automerger skipped] New NetworkAgentConfig API to replace NetworkInfo WiFi...

[automerger skipped] New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: 490e292a am: 1cb0560d -s ours am: b9734d68 -s ours am: 9f9333a1 -s ours
am skip reason: Change-Id Id13fcf41e05fd1eb26c86717e2684c724b94e401 with SHA-1 138271c7 is in history

Change-Id: Ie7da790de6593f72d5784debd40ab513b4bf7b33