Merge "[CTS] Change the 'wait' scheme for AccessibilityWindowQueryTest" into oc-dev
am: c162154bba

Change-Id: I063c84950349cfe0bf47ae83ab26e7bb91360580