Merge "Wait for ScrollView on wear devices." into stage-aosp-pi-cts-dev
am: 28af620048

Change-Id: Ie9cd41168799c3a98a9384bea368b0f635cf87a3