[automerger skipped] Merge "[Wi-Fi] Fix transition mode problems" into qt-qpr1-dev am: 5b71fccabd am: 98a0e0ec96 -s ours
am skip reason: Change-Id Ic3c7ac1238a51b6e215ed63761720d2bc371d012 with SHA-1 5f23a43660 is in history

Change-Id: I3873872ee251ada9a11442e4efdf1dcadfb0774c