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

Change-Id: I2595b3dfca3bf67c3fd57a1fe04ca5614ad3bbb2