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

Change-Id: Iad8cdf7b3cbdcc382a3d41df29369cf12ae32c8d


Trivial merge