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

Change-Id: Ib87bdb31a9cb3996f8acc9966a51e1c171f3022f