Merge "mock wifi (nl80211-framework#2): new constructor for mocking WifiNl80211Manager"