am 05607699: Merge "Fix WifiInfoTest flakiness" into jb-dev

* commit '05607699171bd220d050897d2b8e956d6fc79258':
  Fix WifiInfoTest flakiness