[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:44:27 +0000 (12:44 -0700)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Apr 2018 19:44:27 +0000 (12:44 -0700)
am: 1213a776a6

Change-Id: I5a3e06a0da4005235b1a87c4e0770a2ef80150eb


Trivial merge