Merge "[Wi-Fi] Support transition mode in AccessPoint#matches" into qt-dev am: 1b9e062d24
am: b85c1276c7

Change-Id: I7b2cab76a242f0897dc37d974438ee8e56012624