Merge "wifi: fix testWifiManagerActions test failure" into oc-dev
am: 3c3054ec78

Change-Id: I67fa37c57437f43b5ceafb41e1ec7d6f5bcbff04