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