Merge "Switch some objects in WmTest to use spyOn()"