[automerger] Allow the window to be recreated in the middle of a test am: 30ef1bf331...
authorAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 30 Apr 2018 19:32:59 +0000 (19:32 +0000)
committerAndroid Build Merger (Role) <noreply-android-build-merger@google.com>
Mon, 30 Apr 2018 19:32:59 +0000 (19:32 +0000)
Change-Id: I62e863ad7c0e7408438f5f8f919472c58c2c8d32


Trivial merge