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

Change-Id: Ib27bd64528218cf826a3a674efad863e3cdc6555