Merge "SF: remove unused variable on chooseCompositionStrategy." into main am:...

    }

    // Get any composition changes requested by the HWC device, and apply them.

    std::optional<android::HWComposer::DeviceRequestedChanges> changes;

    auto& hwc = getCompositionEngine().getHwComposer();

    const bool requiresClientComposition = anyLayersRequireClientComposition();