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

Change-Id: I8150c542b5735cddf900bfa0ac8b1118789d9ea3


Trivial merge