Merge "Control WifiManager.MulticastLock from connectivity dev app" into nyc-dev
am: 5bd712b

* commit '5bd712b6af1e563c86208a7162d4a67a93caf3d2':
  Control WifiManager.MulticastLock from connectivity dev app

Change-Id: I76660144a5db75265cb6f78ed3c014403c2bd333