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

* commit '0c84e39f52ff5aff39164b3ce1cf7d20068a269c':
  Control WifiManager.MulticastLock from connectivity dev app

Change-Id: I5641bd925232d95098e552544eb3a73506e81d66