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

Change-Id: Id99663e245f0c04e653c9cf99b10d341de0be445


Trivial merge