Allow the window to be recreated in the middle of a test am: 30ef1bf331
authorLloyd Pique <lpique@google.com>
Mon, 30 Apr 2018 19:40:22 +0000 (12:40 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 19:40:22 +0000 (12:40 -0700)
am: 38611cff1b

Change-Id: If75c089eace7e4d67dbb28abfa7928a769decc6a


Trivial merge