Merge "WM Tests: Use a separate WindowManager instance per test" into pi-dev am: 71c632367a
am: cc5779a287

Change-Id: Ieb474399335bde49d7f13213fbde9b3cbc009a7f