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

Change-Id: I5d3ccd0767e7413341cfe6e9c1c1d0512a0d3e0a


Trivial merge