Merge "Do not trigger scan for reconnect() when wifi is connected" into oc-mr1-dev
am: 87d7badd66

Change-Id: I0839f314c88b32e141e9995832bfd07a42e16d12