[automerger skipped] Merge "[Wi-Fi] Fix transition mode problems" into...

[automerger skipped] Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 2d5732ca am: b68aa8da -s ours
am skip reason: Change-Id I9688f51f4a4b8e3d5c080fb0d0103abb4e3fd79b with SHA-1 4021f673 is in history

Change-Id: I0ee8c0f9e3d650edad68e0dc98f440b9d1e99f6b