Merge "[NAN] Refactor WifiNanManager to create separate sessions per connect." am: 84b3d2040a
am: 337baf9d42

Change-Id: I9163d5c6f37ba32ad3ee076b345b89d44d96275f