Merge "Merge "[Wi-Fi] Support transition mode in AccessPoint#matches" into qt-dev am: 1b9e062d am: b85c1276" into qt-r1-dev-plus-aosp