Merge "WifiManagerTest: alt way to check callback" into oc-dev
am: 52fbde5255

Change-Id: I6aaf92372ec62b1d7775492b56ac908f09cf056f