[automerger skipped] New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: 490e292a76 am: 1cb0560dc2 -s ours
am skip reason: Change-Id Id13fcf41e05fd1eb26c86717e2684c724b94e401 with SHA-1 138271c795 is in history

Change-Id: Ie3ca4a47c607c630bdae63cd7665c3737901404e