Merge "PhoneWindowTest: promote to presubmit" into pi-dev
am: 7fd2abdf41

Change-Id: I0c8031cb69a7176b877ff00462f2dfb555be24be