[automerger skipped] New NetworkAgentConfig API to replace NetworkInfo WiFi stuff. am: cd457ea5ec am: 6bef08258f -s ours
am skip reason: Change-Id Id13fcf41e05fd1eb26c86717e2684c724b94e401 with SHA-1 5f617f9a07 is in history
Change-Id: Ie3ca4a47c607c630bdae63cd7665c3737901404e
This commit is contained in: