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

Change-Id: If804da4a4cfee8c44607aebad7353e6c2397d548