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

Change-Id: I3c20098f26db9e30c18407d01b21ffe729318cce