Merge "hwc2: Fix Hwc2Test.SET_VSYNC_ENABLED_no_callback_no_power"