[NAN] Refactor WifiNanManager to create separate sessions per connect. [DO NOT MERGE]
am: a2eb21d123  -s ours

Change-Id: I50a2a084a16c127b9b05c7d06429655c18841447