Merge "wifi/wifi aware: Migrate to public NetworkAgent methods" am: d8f2fc84b0

Change-Id: I690b07e9c6c228b446308d77603aa4174069df10
tree: 88fade787b536ad7c481bbb2956e3f4567491cb3
  1. service/
  2. PREUPLOAD.cfg